From 6265fcd25930991df535bb79e6dd1160b62c7ddf Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Wed, 6 Jul 2011 17:09:11 +0200 Subject: [PATCH] * net/network-stream.el (network-stream-open-starttls): Try using a plain connection even if the server offered STARTTLS, and we kinda wanted to use it, if Emacs doesn't have any STARTTLS capability. This should make smtpmail.el work in slightly more configurations. --- lisp/ChangeLog | 8 ++++++++ lisp/net/network-stream.el | 14 +++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0ca9c56fde0..1c681342dab 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2011-07-06 Lars Magne Ingebrigtsen + + * net/network-stream.el (network-stream-open-starttls): Try using + a plain connection even if the server offered STARTTLS, and we + kinda wanted to use it, if Emacs doesn't have any STARTTLS + capability. This should make smtpmail.el work in slightly more + configurations. + 2011-07-06 Michael Albinus * net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window): diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index effba41c564..038794e117d 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -281,18 +281,14 @@ functionality. (network-stream-command stream capability-command eo-capa)))) ;; If TLS is mandatory, close the connection if it's unencrypted. - (when (and (or require-tls - ;; The server said it was possible to do STARTTLS, - ;; and we wanted to use it... - (and starttls-command - (plist-get parameters :use-starttls-if-possible))) + (when (and require-tls ;; ... but Emacs wasn't able to -- either no built-in ;; support, or no gnutls-cli installed. (eq resulting-type 'plain)) - (setq error - (if require-tls - "Server does not support TLS" - "Server supports STARTTLS, but Emacs does not have support for it")) + (setq error + (if require-tls + "Server does not support TLS" + "Server supports STARTTLS, but Emacs does not have support for it")) (delete-process stream) (setq stream nil)) ;; Return value: -- 2.30.2